screenShield: Use duration 0 when not animating

Instead of using a special branch for the not animate case, just use
the same path with duration 0.

Since commit ee09c5c85312f571e14abe69bb6674a361c16d65 we are sure that
duration 0 is always preserved.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2987>
(cherry picked from commit b4676f0e9e4aea3745a71cd90f2c3a4983a91fd0)

diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index f8c59fa975f0a08c1a0983e57a7e257a7491ae1a..526aa8bfd1449b2ad28cc28108adc343982527c0 100644 (file)
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -397,25 +397,21 @@ export class ScreenShield extends Signals.EventEmitter {
 
         this._lockDialogGroup.remove_all_transitions();
 
-        if (animate) {
-            // Animate the lock screen out of screen
-            // if velocity is not specified (i.e. we come here from pressing ESC),
-            // use the same speed regardless of original position
-            // if velocity is specified, it's in pixels per milliseconds
-            let h = global.stage.height;
-            let delta = h + this._lockDialogGroup.translation_y;
-            let velocity = global.stage.height / CURTAIN_SLIDE_TIME;
-            let duration = delta / velocity;
+        // Animate the lock screen out of screen
+        // if velocity is not specified (i.e. we come here from pressing ESC),
+        // use the same speed regardless of original position
+        // if velocity is specified, it's in pixels per milliseconds
+        const height = global.stage.height;
+        const delta = height + this._lockDialogGroup.translation_y;
+        const velocity = height / CURTAIN_SLIDE_TIME;
+        const duration = animate ? delta / velocity : 0;
 
-            this._lockDialogGroup.ease({
-                translation_y: -h,
-                duration,
-                mode: Clutter.AnimationMode.EASE_OUT_QUAD,
-                onComplete: () => this._hideLockScreenComplete(),
-            });
-        } else {
-            this._hideLockScreenComplete();
-        }
+        this._lockDialogGroup.ease({
+            translation_y: -height,
+            duration,
+            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
+            onComplete: () => this._hideLockScreenComplete(),
+        });
 
         this._showPointer();
     }